Merge pull request #272 from knu/tzinfo-data
Bundle the tzinfo-data gem for those platforms missing one in the system.
Andrew Cantino
2 changed files with 13 additions and 0 deletions
+ 10
- 0
Gemfile
@@ -3,6 +3,16 @@ source 'https://rubygems.org' |
||
| 3 | 3 |
gem 'protected_attributes', '~>1.0.7' |
| 4 | 4 |
|
| 5 | 5 |
gem 'rails', '4.1.0' |
| 6 |
+ |
|
| 7 |
+case RUBY_PLATFORM |
|
| 8 |
+when /freebsd/i |
|
| 9 |
+ # Seems FreeBSD's zoneinfo is not exactly what tzinfo expects |
|
| 10 |
+ gem 'tzinfo-data' |
|
| 11 |
+else |
|
| 12 |
+ # Windows does not include zoneinfo files, so bundle the tzinfo-data gem |
|
| 13 |
+ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw] |
|
| 14 |
+end |
|
| 15 |
+ |
|
| 6 | 16 |
gem 'mysql2', '~> 0.3.15' |
| 7 | 17 |
gem 'devise', '~> 3.2.4' |
| 8 | 18 |
gem 'kaminari', '~> 0.15.1' |
+ 3
- 0
Gemfile.lock
@@ -285,6 +285,8 @@ GEM |
||
| 285 | 285 |
ethon (>= 0.7.0) |
| 286 | 286 |
tzinfo (1.1.0) |
| 287 | 287 |
thread_safe (~> 0.1) |
| 288 |
+ tzinfo-data (1.2014.2) |
|
| 289 |
+ tzinfo (>= 1.0.0) |
|
| 288 | 290 |
uglifier (2.5.0) |
| 289 | 291 |
execjs (>= 0.3.0) |
| 290 | 292 |
json (>= 1.8.0) |
@@ -355,6 +357,7 @@ DEPENDENCIES |
||
| 355 | 357 |
twitter (~> 5.8.0) |
| 356 | 358 |
twitter-stream! |
| 357 | 359 |
typhoeus (~> 0.6.3) |
| 360 |
+ tzinfo-data |
|
| 358 | 361 |
uglifier (>= 1.3.0) |
| 359 | 362 |
webmock |
| 360 | 363 |
weibo_2 (~> 0.1.4) |